Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:09:39 +0000 (10:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:09:39 +0000 (10:09 -0700)

Trivial merge